Revert "201402 upgrade merge - round 8"

This reverts commit cabf4ac80b8d2f35f2f1f4abe777025efd1931bc.