Revert 2354250..3fc1a87

This rolls back to commit 235425058c3f8147188a6c0f7180f3d6d5c607ad.