Revert "201402 upgrade merge  - round 7"

This reverts commit 9b8d39ad29fcf47fb3abb9c3bd2abff98be6ae91.