Revert "Merge commit '79dd9df' into cg_merges_20130524b"

This reverts commit 02ac49ccf4de7dd81bca6abc5aeedfe8d783040d, reversing
changes made to dd4904c75f4d2e890c0c10611a00ce130778fa6d.

Makes everything constantly stale