Revert 91612f9..8d50991

This rolls back to commit 91612f9dbe77e22b5daaad43380ece65fd7677d2.