Workaround for issue encountered during 0.16 upgrade.