I think this one should be backported to 5.x as the current workaround is both verbose and unintuitive.