This reverts commit 56d8f2d6. Actual relocation fixed in commit fecc7e3a Change-Id: I857723cbfeb40507fb70775ffe31f3cbb26659bd