Accidentally reverted one earlier fix in the last commit.