This reverts commit d47b4a9949. Description: 4.1.2 hasn't been released yet, so removing these paths from the 4.2 branch.
d47b4a9949