revert to known good state

reverts the following:
ab1bd45209f88cca6752621283c12157ddcef86c
b67dd42804721f891cc515e78c3b89aa724601b2