Reverting r176019. Corrupt patch.