This reverts commit 8e242cd012. Revert because lib/pq has known issues with context cancellation. These issues need to be resolved before these changes can be merged. Change-Id: I160af51dbc2d67c5449aafa406a403e5367bb555
8e242cd012