This reverts commit aff6ffc8. Version landed differs from version reviewed in (stylistic) manner worthy of separate review.