Ugh, the most frustrating commit, EVER!

This reverts commit 1e1ac7fc38c2788eae57e0aed97d0da3227e0778.