Revert "more testing needed"

This reverts commit d00709afb43e111f011617b92bbeca2143c43e1d.