Revert "Merge remote-tracking branch 'origin/Alex' into JRBranch1"

This reverts commit 92b338238bc1adb2482ea0203c35256d08f01c16, reversing
changes made to ea185ee22e0ddab34e791e0551d974e17d34431e.