Revert da453c8..229c908

This rolls back to commit da453c8d8c14ec657385eb9f3fdfe34d76b93de9.