Revert #2088: It breaks layout in a few tested templates