90102e1009
* commit '1ae8a98e8a6ba82396955c0b6ab0e02568a3494b': Revert "Add a way to override Xfermode DO NOT MERGE"
* commit '1ae8a98e8a6ba82396955c0b6ab0e02568a3494b': Revert "Add a way to override Xfermode DO NOT MERGE"