partially add apache support back