Remove expensive query. Closes #3116