Update for 0.6.5.
Backward compat for <0.6.5.