Revert 05a5869..fcee133

This rolls back to commit 05a5869d96ef1fa4328e4e595889058ab6a23039.