Remove header restrictions

#2142