Revert "RF001"

This reverts commit a18bed4af92bc1159d6d663585b9b4face2d2519.