Amend commits 4a0801f5 and a9549c2d9.