This reverts commit cd7e5d1111. Co-authored-by: Martijn Cuppens <martijn.cuppens@gmail.com>
cd7e5d1111