Reverted code for RPV-238