Revert 118a790..0703f92

This rolls back to commit 118a7902d39c8a32336e5cf429cc993054a92f51.