That inexplicably got merged even though it was rejected upon review.
This simplification follows afe774e0.