Revert "Merge remote-tracking branch 'refs/remotes/origin/master' into personal-page-fix"
Revert "Merge remote-tracking branch 'refs/remotes/origin/master' into personal-page-fix"

This reverts commit d5125ceb16feed8994af3eb0d644e3729a6154b5, reversing
changes made to a8b5e02261b93f6185705e08c77c4ffa271d9283.

skylite-manoa/warrior-scheduler,skylite-manoa/warrior-scheduler