Remove out-of-tree workaround.