This fixes #7715.  The requirements are now in the correct places.