Revert "83d2805899d67b7ca1581ef03c38cdb05a0dcc86"
because we had unwanted changes in original file.

This reverts commit 75813461a266017c4a281743a252e298cd7153b1.
83d2805899d67b7ca1581ef03c38cdb05a0dcc86