Revert Snapdragon optimizations...