LGTM, and I think patched as simple as this could be pushed directly to staging.
Pushed to staging as 596d845aed0005ca759c655ad8a83d9967c0b724 Closing ...