Revert 04c2d293985adced1bd702fca16357b858002bb8

This has been discussed in #2653, where the original author @ncanceill
agreed to it.