Revert "Rethink 2x src alpha->color doubling. Fixes #3379."

This reverts commit 47efded29fbde6e5cee23ad413b1da6e7566a7c0.
2x alpha: Safer change than the last attempt. Still fixes P2. I think this can be simplified, anyway.