Removed code that broke tests.