Revert accidental part of last commit