Authored by Justin R. Miller

move to upstream's layer handling for callouts

Subproject commit f1c7ba1e83e61e4f1dc349eb8328670e4538fc20
Subproject commit a2020fc86aaed00ede750af41cc8889159e42a6d
... ...