Yeah so that didn't work.. reverting to plan b

This reverts commit c0a9adce6d88ba3fc6d9aed3c464cc1fafb06c09.
Plan B Drop Aliasing flags to =2

Change-Id: I27115d3aa85fa49f77a47b765c208fa5596fb2c3