This commit included a change that should have been in
its own commit, and turns out that you can do what was
suposed to go in it in much better way as well.
This reverts commit 5080e8bea6.
This commit included a change that should have been in
its own commit, and turns out that you can do what was
suposed to go in it in much better way as well.
This reverts commit 5080e8bea6.