Temporarily revert r56550 until missing commit can be added.