Revert api to 1.6.0