e2b444d89a
This reverts commits *e6fa82f132*fb41f4077d*75b955057c(eric6 part) Requested by: fluffy, tcberner
This reverts commits *e6fa82f132*fb41f4077d*75b955057c(eric6 part) Requested by: fluffy, tcberner