This reverts commit 56edf062. This change modified the public API/ABI which is not allowed in stable releases.