Second go at fixing 'grunt unmask'