Support removal of a limiter (fix #35)