Revert "Merged Roy's changes and removed R3F."

This reverts commit 612b93e55f4be450444452f338714c8330aada55.