Rebuilt to incorporate 41c6e5359b727d55cdfb5c5f2d5789824e79d7a4 and prior