32ac7a11 tried to fix a Hot Standby issue
reported by Greg Stark, but in doing so caused
a different bug to appear, noted by Andres Freund.

Revoke the core changes from 32ac7a11,
leaving in its place a minor change in code
ordering and comments to explain for the future.