Revert "HotFix1"

This reverts commit d3d38c6156f0c08cd0e27d1fe92be4f382369a51.