undo commit from 2.0 merge

Was made on error