Revert "Changes on 04-02-2013"

This reverts commit 3e4625f79c4ac7bb1c6fdf9a5c1652df50ebf2e4.
Revert "Revert "Changes on 04-02-2013""

This reverts commit a12ead685700c744fa67b7b74a0652a771461d47.