Revert "Comment this for now"

This reverts commit 8988199fabdfd22f33f06732443c0a70ab5763a7.