I really hope they fix this next season, because if the don't they just destroyed three years of character development.

This is it. This is why the finale is so horrifying to me. If the writers mess this up, then Castiel's storyline is completely and utterly nullified and most everything that has come before character-wise was ultimately for nothing. That. Cannot. Happen.

You here me Edlund? You've got to make sure the other writers don't screw this up! We need our nerdy angel back!