Reverted Commit def341554ce6da53215fa9640cc2c80ce7a1dd9e due to problems

Too many admins had problems with the change, so I reverted it.