Database upgrades fail going from 4.0.7 and 4.0.8 to 4.1.0

I am getting this error when I run the upgrade script:

Sorry. A non-recoverable error has occurred.
DB Error: no such field
Error Details
Database Error Code: Unknown column 'contribution_page_id' in 'NEW', 1054
Additional Details:
Array
(
[callback] => Array
(

=> CRM_Core_Error
[1] => handle
)

[ (edit)code ] => -19

[message] => DB Error: no such field
[mode] => 16
[debug_info] => UPDATE `civicrm_pcp` `pcp`
SET `pcp_block_id` = (SELECT `id` FROM `civicrm_pcp_block` `pb` WHERE `pb`.`entity_id` = `pcp`.`page_id`) [nativecode=1054 ** Unknown column 'contribution_page_id' in 'NEW']
[type] => DB_Error
[user_info] => UPDATE `civicrm_pcp` `pcp`
SET `pcp_block_id` = (SELECT `id` FROM `civicrm_pcp_block` `pb` WHERE `pb`.`entity_id` = `pcp`.`page_id`) [nativecode=1054 ** Unknown column 'contribution_page_id' in 'NEW']
[to_string] => [db_error: message="DB Error: no such field" code=-19 mode=callback callback=CRM_Core_Error::handle prefix="" info="UPDATE `civicrm_pcp` `pcp`
SET `pcp_block_id` = (SELECT `id` FROM `civicrm_pcp_block` `pb` WHERE `pb`.`entity_id` = `pcp`.`page_id`) [nativecode=1054 ** Unknown column 'contribution_page_id' in 'NEW']"]
)

Things I have done to get this to work:

• ran upgrade from 4.0.7 to 4.1.0 – failed
• ran trigger removal query
• upgraded from 4.0.7 to 4.0.8 after the upgrade from 4.0.7 to 4.1.0 failed
• ran upgrade from 4.0.8 to 4.1.0 – failed