Revert "201402 upgrade merge - round 6"

This reverts commit 65f47e687ef27d6f6dc27d30d97c3677506db466.