Done with bug 840952

Will leave a note in the code