I'm generally not a fan of checking in commented code. Instead of this, would it it be possible to just delete what's comment out here? If further work needs to be done we should track that work in github issues rather than code comments.