Good idea. Please put an ENYO-XXXX place-holder here with the follow-up JIRA so that this backward compatibility item is removed at the right time.