More ugly commits while migrating - tmp removal of rule to force creation of user option