At this point I am not sure if best course of action to disable it harder or restore it ... but I hope attached patch at least visually restores strange mess we see by default now in test project.