What a non-public API mess