Fix breakage from refactor