Comment by trq_

hi guys, this is my change- will patch it to be an opt-in