Revert 23c435d..240365e

This rolls back to commit 23c435d3f544b5f3763108ad79573109be70d909.