This reverts commit 5ae7cdfe. Reason for revert: Unknown crash in linker Change-Id: Ib5646376e2e589a7a6c4d66e72caa1f208a15905