Revert "Maybe fixed RoF"

This reverts commit ac6cff846425a9ef2345ee7fa2b5a1250ce3feb1.