Disable aliases

Change-Id: Ia3f96fefaf8f314b8890c57a2509962eb1cd6746