Reversed API changes..