Partially revert previous commits; ensure the bundle is fixed up correctly