Bjarocki/revert unnecessary changes