That's where we put it earlier, so that's where we'll find it now. This addresses part of issue #773 (subissue 3).