Revert deb4aee..88cabfe

This rolls back to commit deb4aee6a2185645b197a9a8524e7ed2232a7410.