I'm afraid that we'd need to live with the workaround for Leap 15.0. Feel free to reopen if you see any regressions by that. Thanks.