Reverting masking process. Behaviour from last commit was unexpectedly bad.