Revert "R2"

This reverts commit 7eaf34e4b12a150613a823e4de904a88d6b51b54.
Revert "Revert "R2""

This reverts commit 00d1280c27b6cb9ea9654d3dc9bec7bf66eba678.
R4