Reverts ee0b54f8. During 4.7-beta1 tagging only compilation fixes are allowed. CCMAIL: aspotashev@gmail.com