I've missed the patch files in the previous commit, my bad. This reverts commit 71ffb78557d34408286681d03e41dc612c0b63e1.