Revert "Strict liasing Fix"

This reverts commit 9e3f5abcb4cc9d0ee53fb08e0e23e2051e04c64b.

Change-Id: Ibbb35a85e41838eaea3238444c94bc66084353a4