Reverted fix temporarily; another fix by  LukasReschke is awaiting merge