Revert Fix for 7666.
Merge pull request #1246 from AndrejMitrovic/Revert7666

Revert Fix for 7666.