Revert "Enforce the class to run before the main stage - required for dependancies on provider"

This reverts commit 91c65421eeae358c40f14fc48e254905ecef563b.