Remove --disable-etcdir option