Removed altoflag-based checks