Revert "Still getting choked up here..."

This reverts commit da86a9fb3cfd30a9bfc53662261df05b8050042e.