Ditched --module-dir and moved back to a state that does not introduce altered releaes behavior