Temporarily remove some code to make this work