remove with boolean return value breaks binary compatibility with 0.19. postpone that.