Preparation for backward compatability break.