Revert 5d12c34..cceebe9

This rolls back to commit 5d12c34a925c69f92d49dc7c0cc8cde99d8e1178.