Reverted the change which caused this. However, we still should improve the code (and the bug might still exist in similar forms). Will probably fixed together with #768495
Reverted the change which caused this. However, we still should improve the code (and the bug might still exist in similar forms). Will probably fixed together with #768495