Revert "Reimplementing controlled RAF"

This reverts commit e881c839906d6b2d13fdce3e2b778e2613715967.