Revert 1dd2819..dcfa53a

This rolls back to commit 1dd2819f32fcaf7d15c66bdf58c0b2672ece06df.
MASKS EVEN FOR CIRCLE
MASKS