This reverts commit b9fd8f34ae as it accidentally contained a unit test change that is not finished (and unrelated).
b9fd8f34ae