Bug 3668 fixed
Minimize diff