Revert 68dce0a..2ce3b91

This rolls back to commit 68dce0a2baba5f9a4e66c27221f7633a82f54bb6.