Re-committing r42528: