Revert 59a94fe..ce125a1

This rolls back to commit 59a94fe70c4214442048bdb1636af7bdba8f416f.