Reverted REL-1914 because the requirements were retracted

This reverts commit 453034f51a25a99378b45175d0fd005ec5b9eb60.