This reverts commit 00e3b9a2. It's causing a regression when tested with the proxy_model_inheritance tests.