The previous version is more readable, and that's what is important for me. So, I confirm that this should be reverted.