* commit '6c2db6fb1925f291cc9748cf3bf0897b9001c972': Revert "DO NOT MERGE Correctly implement the CLEAR xfermode."