Switched to use APR 1.x