Revert b24c169..a1f7bec

This rolls back to commit b24c16988a07474f301c28705c021ae17b2cefcd.
gyro