yahoo/mojito — pull request #829 by isao (2012-12-04 19:52:05+00:00)
Title: convert this commit into distinct prs

This reverts commit 2fec4682c8ec9306a80b0cb55238623aa191c979, reversing
changes made to e716cc53de1c4ce19459ad373a3250d2aa17d871.