Re-committing r42514: