roll back some of the more radical stuff
build less radical version