Revert "move to Requirement"

This reverts commit 5246c681e287ffd850bdc17873c940b6484877f5.