Revert back to previous alias style (but still safe)