Readded imports that were programmatically removed

Issue 134