Revert db64023..69b3084

This rolls back to commit db640235fabfc1e5f68fbc9d4aaed8b066eab8e5.