Fixed issue #1694786 by noneTaken: Conflict with field types that already comes with a remove button.