partial revert to cleberts commit