Removed some hacks for Sailfish. Hopefully works on device
without them..