The oldest aliasing fix in the books

Change-Id: Iad74e8189edf36a2283e5c3e7f2d09d475f68595
Credit: Nuke from his toro fix