Fix a temporary hack from the last commit.