This reverts commit 9153515a. Builtbot crash was reported in the commit thread, reverting while investigating.