Fix broken fix for #27