Removed masking in preparation for new gap code.