Revert previous commit, because not properly merged.

This reverts commit eed66bac94e5ab138ea7e243880ded5edd0237bd.