Is it intentional to remove this - not sure it's related?