Revert "gammy merge"

This reverts commit 38a0064259136fb673cb3b57418e7860c225590a.