Revert 7d36c78 -- errantly branched from wrong commit, which shouldn't have been included on this branch.

This reverts commit 7d36c78b42a4b03419bb377856192b68220c91b8.