Revert "Snapdragon optimizations"

This reverts commit d33aee0d88ddb7920cc56f59f78fb31fd31aeb01.