Revert "Requirements cleanup"

This reverts commit 17933541b3ab5fdbac9994ddd6631069181cf13e.