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