This reverts commit 39410b07. Reason for revert: Sailfish running out of space Change-Id: Id6b001084ce13eb3a08bc25c472acfc0282bbb99