[BACKLOG-872] Undoing some API changes