Revert "Merge branch 'rochester-strood-patch'"

This reverts commit 37cbddf7b0da4aa7ab4ecbabc781b0461b68ca8e, reversing
changes made to a7c88b1c68c6387b1c5dfa80cc5aec46962e68de.