Yet another commit to preserve empty directories