This reverts commit 8828ddf0. Reason for revert: Sailfish size issues fixed. Change-Id: I03e22af485918fb41e41eed86b2a7b13f2462128