Revert 72ae4ef..bbc6618

This rolls back to commit 72ae4ef5fd36a2e0a300d44bb9dfdcdda18eaf42.