Revert "add "nomatterwhen" option, not really functional"

This reverts commit aeedb315d6f164b662205545de4cc0430331c51d.