Revert api rewrite commit