Revert fac324b..c3c4bd6

This rolls back to commit fac324bb7e24b12c445a85ac3c61520f56248505.