Revert "Improve swizzle of splatting"

This reverts commit 98ca75c34ded0626668795eab6ef36b39c14255a.