Revert last change. Fucking wrong patch. 5.4.7 is not the supported patch.