Manually applying patch by Rarila.