Revert "failed merge, have odd state"

This reverts commit ad24908399cd950cd03750aa56e7ef877cd95bcd.