Revert 71e60ea..24a4567

This rolls back to commit 71e60ea8c2e34f68427c775ed99a784046c6ee2f.