Revert "Commit20130412_1828"

This reverts commit ec48bcff46b133298647b0b59b3c26e55375ff6d.