This reverts commit 5b460d13a4. Reason for revert: Strange sailfish boot problem. Change-Id: Ibde9375405cca4343c262335647dac120aab4d73
5b460d13a4