This file needs to be reverted as well. I don't think these changes made it into the latest version, but they're on commonplace master