Revert "Optimize imports"

This reverts commit 96e0abf0d7c2ba24f4fe321aabc851f1c9b8e748.

Conflicts:
	common/src/test/kotlin/com/prezi/fail/test/TestUtils.kt