Revert "imask stuff" This reverts commit c48f2acd04fc9d7bddb7073ff745401af7cac815. (commit was not intended to be published)