Stop using stock items

They appear to be deprecated as well, although I don't see the warnings
on trusty, just on utopic.