Revert "Revert "Still getting choked up here...""

This reverts commit 628d2319c80e66b2c355a92e3f7f901ef5b4d7c0.