This file should not be changed at all. Please remove these changes from your PR. These changes revert the fixes for 2 bugs.