Revert "initial (still broken) 1.6 port"

This reverts commit e9b5809e9f2004adbd0515148fff7e969c3526a8.