Brought scheduler back completly, fixes #1502