Revert uneccessary fix for Bug: 12224