Revert "AOSPX version from TeamHorizon"

This reverts commit b72d2b3aaf22f169200d208b31ba8075e3d13413.