Revert "Disable instead of reverting"

This reverts commit d43524a9e9d2cc8fd6a15d85e9d274eafddd8ff5.