Eager-loading Clusterfuck

Called by Alan Norton