Temporarily revert r191910 until the layering violation can be fixed.