Please don't remove code unless you test it. Reverts past 3 commits.