[248015] Reverting fixes for now, until better solution found
1 file changed