Revert "Merging with latest 4.1 branch"

This reverts commit f1423b40f2270802b8b7edd2daebf65c27cd10ec, reversing
changes made to 5c181942214bab045eaadfaeda7d01219ab2d049.