revert in-reference refactoring (see last commit)