Fix up require changes for last patch.