Aims to fix Bug 1021565.