cabd8d1735
This reverts commit c305d63e005c8ca1ae57f1ec54f023e0d0069824. Zak Smith reported it continued to be a problem