Revert last commit and properly fix it.