Revert "React to UsePerRequestServices"

This reverts commit c7f229d55bde2f7d8d190fcb48eafff189a248cc.
React to options changes