first commit to 8.x-1.x
Removed redundant code left by previous manual merge