I'm reverting this changeset for now. It breaks things pretty significantly in this heavily trafficked area. Please send me a message if you want some help fixing things the right way.

Thanks!