Yet another intent at fixing this.