add in-tree fix
drop old and unused