Issue 3952: Hopefully kill the last Story