Revert the last 2 commits and actually fix the right one.