Reverted important change breaking u nit tests