This reverts commit 728b878d. D76417 has caused vgpr count to go up significantly in real-world graphics content.