Revert commit 366b44809a41abc6dedf600312f8518e3e8dc172 as it breaks the
tools