Please rebase this change and the changes to the manifest should be then removed, as I did something inspired by this (thanks!) for 2.0.4 already.