Revert "Revert "Revert "Reimplementing controlled RAF"""

This reverts commit b0f30ce79d01303681e5d493a7a442ee2bf94683.