Revert erroneous revert of contrib modules.