Revert "Oak's demands suck"

This reverts commit bde08ea7dfd0dbe1741a0e33013e6c126767cc6c.