Revert #863 : not free