This is not working as I had imagined it would....

This reverts commit c07214623669da57708ffa60713b2910f21532b8.