to be revertback hack put in core file