Cleanup
Revert "Re-establishing ABI compatibility"

This reverts commit 8febc4645d94a2c09ceb1232b4ff06300c5843c8.
Give up on ABI compatibility between 1.6 and 1.8