First pass at soft revert to c5431fc5bfaec08ae0cf89fd43ae19ab5893a8f2.  If this doesn't get us where we need to be, we'll hard revert