[BUGFIX] revert parts of last change