Revert Benchmark API for version 1.3

Relates to #6256