Revert prev commit, too big of a pain, might contact BarracudaATA for
help with this.