[#921623] This makes a bit more sense.