(cherry picked from commit f7f0ecb566194b39898328560d1576577bae66a8)
* Converted Cho's public requests into the new system, and cleaned up relevant code.