This reverts commit ea42b49f. Some GPU integration tests are failing that I didn't observe locally. Reverting until I have a fix.