This reverts commit c67aa7f2, reversing
changes made to 46bd0e8e.

The merge should have been a noop as the support was added in
601c2388