Revert "RF008"

This reverts commit 52ea5d79ff3b47360415985da29bbab41bb9a1bd.