Restoring all too eager deletion in f294505618226b1101511.