Revert commits that were accidentally pushed.

This reverts commits 9fdb7f3 to 940489d.