Revert "Disable these for now."

This reverts commit 192fad5d70dbe554af7c0b57bf1f8bde2c6c4dc5.