We still keep in the code, as there are some future plans to handle it there in a different way. Fixes #1591.