Revert "Merge pull request #3697 from jeffslofish/Issue-3676"

This reverts commit 9e99101057f745ad122b5868840ccf43c7732f1a, reversing
changes made to a9e27717f46c851144ae2456368251448be8633d.
revert submodule changes
Merge pull request #3721 from adobe/randy/backout-3697

Backout pull request 3697