Revert "Commit to teach Rich revert"

This reverts commit 010574afff38499e7141f47b47ef39e9af6107e9.