Revert "Make iPhone 6+ behave more sensibly."

This reverts commit d3d1e67dae2887a6693e866d5b05d007cf02d0bc.
Add corresponding argb8888 method as suggested.