revert the last change as it introduces a huge performance delta