20140729 1544
Revert "20140729 1544"

This reverts commit a003052e4db8a47c1c2b3b70e05d9c5daf3d222e.
Revert "Revert "20140729 1544""

This reverts commit 45aabd190856d9de47f6c6342dd607e8186153a6.