Revert Tim's last commit to get rid of 7+ unnecessary / broken changes.