This reverts commit d8082065, reversing changes made to 30085bd4. This is not needed Requested-by: Marton Balint