Also note that we want to keep HTML changes to minimum in 1.9 anyway.