Revert: Back port variable initialization fix from development.

It turns out that the new feature was actually a bug.