Revert #1273 as you couldn't save items