Revert "201402 upgrade merge - round 2"

This reverts commit 27937f9350f9c301e6800f51b5c1c7767b56462d.