Revert "Fix some stuff from the last merge."

This reverts commit 9ed3c336f3b2a5d0da13a45afe1da36fb91b0705.
Revert "Merge remote-tracking branch 'remotes/upstream/master'"

This reverts commit 20beb61907ce70163a1543b67ca4a2e99386a8d1, reversing
changes made to ee444ba9e42815baac779fc17a132ebab24ad1d1.
Fix attribute error on Numbers.calling_tests generating HTML report.