Revert "Merge branch 'test-idea'"

This reverts commit 4e07e37781c1cc9e009821078ebc46cdd51bbfdb, reversing
changes made to bdd3996d38d885e18e5c5960df1c2c06e34d673f.