@bgamari indicated they were broken in cd85f8a7 but didn't say why.
This MR attempts to re-enable them.