Revert 47faf1e..12c4cbb

This rolls back to commit 47faf1e3aed9bc53a3b4f188b38968ce4fa354fe.