Revert "hand rolled out 220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again"

This reverts commit f8e3ba5bfad14f3037d72eb6243258c13169cbd8.
5 files changed