Revert "Match upstream changes. With proper comment"

This reverts commit d9af9fe2b54907890674c9bcb6f2a626fee5b141.