Revert "api overhaul"

This reverts commit d8dcb009cac77610792ead812c96eece5031dc25.