COUCHDB-1696 really fix R14B04 support