Revert "Merge remote-tracking branch 'upstream/master' into v1.4.1-mapr"

This reverts commit 778885d426eab0827c4bf8d637eb02d1c24d0792, reversing
changes made to 14b92aa3ae742eb7bf19ecd117284df081166e34.