This reverts commit 660b740e. Crash reported in the review thread post commit. Reverting while investigating.