*6670* Revert bug 3520