Revert 28ba175..e805e98

This rolls back to commit 28ba17577b80a23039ff10b154ee82f89b317ccf.
Revert "Merge branch 'John'"

This reverts commit 67072b88fcdf098b3e33f15d686fcdb3808f54c6, reversing
changes made to b24701a69447ae7eee24475398cacbbc6221d464.
Revert e94c9ac..b5d38ba

This rolls back to commit e94c9acd863cb987926b22ddd2e8789d0cec8de1.
Revert b24701a..91945db

This rolls back to commit b24701a69447ae7eee24475398cacbbc6221d464.