revert accidentally commited work towards no-strict, Mouq++