For ENG-5515, revert unecessary churn in SpScheduler.java