Code review comment for lp://qastaging/~apinheiro/unity/Bug705442

Alejandro: I reverted the change fixing the main reason this critical assertion was emitted [1]. Tell me if it's ok for you and if the merge still makes sense.

[1] http://bazaar.launchpad.net/~unity-team/unity/trunk/revision/790