Commiting before I make potentially game-breaking change.

Hope it works.