This reverts commit d2a99ce0b4. It does not really fix the build and was accidentially pushed.
d2a99ce0b4