trying revert moto fixes