Revert "API BUG"

This reverts commit edd5adc81bdeb5a304960d267f4504353387fb6f.