Disable, don't remove. Should fix #446, for real this time
This might actually be more efficient.