Reverting commit. Works on Simulator but not on the device...