Re-switched to Mozilla's frameworks_base