revert previous commit.

or at least part of it.