f8fcba2fa2
This reverts commit bd70e73c25b0ec18373c9d2270ebe386c304076c. Turns out the commit was due to a miscommunication -- the commit it was fixing actually worked fine, and this fix was unnecessary.