Reverting my r193344 checkin due to build breakage.