This reverts commit 9fc1a0dc. We have bisected a compiler crash to this revision and will provide a test case soon.