Fix import error

Really this is a questionable dependency; util ought not to rely on
model. This should be remedied. Moving the mask class to this
file would be perfectly reasonable.
Merge branch 'fix-mask-import' into deploy