Revert "Merge commit 'be70353154' into pulp-2.0"

This reverts commit 9cf2b87779d4051a6f68da58fa872d6dd0f26610, reversing
changes made to 09ab3d7419c2da3ff864c7591e92fb5a050d0589.