Please see #857 then first.
Otherwise I'd have to make changes to this file that are going to be deleted anyways.