Multilingual upgrade breaks for v3.3.6 -> v4.2.beta1 upgrade when it tries to make some fields monolingual

Background for making fields monolingual -
http://civicrm.org/blogs/shot/multilingual-civicrm-3440-making-some-fields-monolingual
http://issues.civicrm.org/jira/browse/CRM-7869

Upgrade fails at:
UPDATE civicrm_address SET supplemental_address_1 = supplemental_address_1_en_US

Happens when CRM_Upgrade_Incremental_php_ThreeFour::upgrade_3_4_beta3 calls crm_core_I18n_schema::makeSinglelingualTable().

Even though we drop column, triggers exist. And any update query invokes the trigger which expects dropped column to exist - and therefore the error.

Just solving above problem doesn't solve it completely as the process down the line goes a different path than it would go for a normal multilingual upgrade.