Revert "Sync with AtomJack's mainline"

This reverts commit 0d0b1a784cdcec2ef8de33c93a0a00c51de3134d.