Patch to 3.0.53 (intervigilium) this time without the patches in the commit