1.5 compat (bug 874190)

don't merge yet