Revert "broken in upstream, disable for now"

This reverts commit 3ec0c392b82dca552adabe7d19dbeedafafc3754.