Revert 3627517..75b3747

This rolls back to commit 3627517e88700aa8750970105dec20f82d6b3d95.