Remove special treatment for items aborting
Release v2.0.1