I'm not a fan of commenting out code. Is this something you intend to add back soon?