HomePhabricator

Re-Reinstate 347294 with a fix for the failures.