[FXOS-233] Reverted b8ac91c and made it much simpler