Revert "incoming merge"
Revert "incoming merge"

This reverts commit 997e21b214cef45faf3df988c4972897eb4dfca7, reversing
changes made to 7c0268280afa0c209352038e8280df323fdfdc05.

quicktype/quicktype,quicktype/quicktype,quicktype/quicktype,quicktype/quicktype,quicktype/quicktype