Revert "Commit r7"

This reverts commit 70e64294b6a3048215605562d99d1136a88d2859.