Disable selector rebuild - closes #851