Revert "Eager load amounts to reduce queries in some circumstances."

This reverts commit 02d2b13c8d9cb66f4e43582113d88d3aa0dd9785.