[master 13/22] Get rid of some requirements that should not be necessary.