Reverting rebase to 3.0, recreating original customization in one commit