Fix botched code move from revision 6ffeb64e