This could perhaps use an XXX comment so it doesn't get forgotten.