Reverts the changes for the bug 982