Revert "for now disable this"

This reverts commit dbb6f4708faedd1a8eff130aaeb87b5f3c7eaf98.