revert changes to api types - pulled back into core