Revert "Dirty: comment out for compile error"

This reverts commit 51b08b2c6daec7e2964a67ac937a99046711533f.