Removing auto-aliasing for now