Revert the last commit as there's a better way.