Revert "Disable NOOP scheduler during config"

This reverts commit 2a0c9a6380ed40df9580a234227f29ff80dcfe70.