Changes for compatibility with v6beta12.