Revert the last couple of commits to keep this generic.