Now this is (presumably) working we can remove the silly ancient comment lying at this line