Revert "201402 upgrade merge - round 5"

This reverts commit c24ad02e89e23e9eabbdcb2ae67283a8f83184d2.