Revert "201402 upgrade merge - round 11"

This reverts commit 310a4876ec6f99d3f6a708840f0cf1e9c69e3c32.