Revert fa9794f..fef0bb1

This rolls back to commit fa9794fb5f5003e470aaf6abc2cda832a9b9684c.