This reverts commit 3cfc9f9744.
3cfc9f9744
requireOptionMatch
Co-authored-by: Thijs Louisse <thijs.louisse@ing.com>