This partially reverts 337a09d182 but keeps the newly added tests. Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
337a09d182