revert part of the last change, should fix regressions