IntelliJ, stahp!
Corrected import paths for 1.7 R1
Remove the mask command for the time being.