Replace strict draw ordering patch with a different approach.