Revert 70f3110..fc5df8a

This rolls back to commit 70f31106df61dc1d51427cd38f532e19ec8486ee.