Revert "Added better input masking"

This reverts commit aed3313375d0db958bc4735708cb6f893ed3f8a9.