Revert "Fix Driving Mode again II"

This reverts commit cb8d8bfc76166109ca23e946c5f91f223f16172c.