Reverted dubious mobility changes