Fixing how this is actually going to work in ExtBase land.