Revert dependency on commons configuration