Revert "Fix extra query on has_one associations"

This reverts commit 5a1f8f3b5256af3cfb3d3fc99737c37a3660591e.