make bug 997131 work actually work on both sides of the change and merge branches