Revert a change introduced by commit b500fcc