Very true, I removed this ugly thing and passed it recursively in 56d527ab19462afc130268da6e39f095d0e13f2f