I don't really understand this branch, but as I said on the other comment, I would be more comfortable not supporting this API.