More steps in the process of requiring a signature when we change the
switch in __init__.py