This should be an amend to 3b1711cb151a2, but I already pushed that.