Revert "Bug 15253: (follow-up) Fix qa complaints"