Re-does the change from Commit # 0bda13b59cf3257c9585d11b590e00698df76787. Was accidentally removed in last merge conflict commit.