Revert d8abb6e..e39fc49

This rolls back to commit d8abb6ec87c7b060ca4dae978949d3c680577823.
def remove