Rolling back API breaking change.