Simplify commit message

Pending the agreement on the core issue.

Actually, as agreed internally in our stand-up, we'll deploy these changes, and if/when needed, the existing related or follow-up issues can be created to change functionality. So merged.

Automatically closed - issue fixed for 2 weeks with no activity.