Revert b52dce7..f041143

This rolls back to commit b52dce7a842a0e0d084a738ae07334871c632e4e.