Should this still be taking a layout argument at all? It's unused.