Revert changes

Is fixed in master