LP#1786534: ensure that changes don't regress