R2R is over, let's go back to the original design.
This reverts commit db7762c7.
This will create a new commit in order to revert the existing changes.
