Revert API changes

Backward-compatible

P.S. Not-47e stop spamming!