Revert "Match Upstream Changes"

This reverts commit c58ffa39996403ec4d53a25f2f808b2c7b8c74fb.
Match upstream changes. With proper comment

https://github.com/raspberrypi/linux/commit/f7bef2ee742f78f555a7a36d133c5b39eecff750