For #184: this stops the melting for me on emulators of 2.1 and L.

Doesn't make CM11 N7100 any worse.