This commit from Laxtiz.