Fixed import that appears to have reverted to broken state