Remove, don't hide. Closes #2532.