Errrm, the last commit had some unintended consequences.