Revert "play nice with associations"

This reverts commit 70f20fc0aab32cb66fbb4d88d0cae2ad036f795e.