Bug 75715 - rollback useless changes