testoptions: reverted commit 184db3900e8ee1be49c65c05d87c27d0ddb5db50