Revert "Merge branch 'Mike' into Min"

This reverts commit 5c486c0940e689469e2fbda564bd6774a34c4360, reversing
changes made to c31251b8efe380970806b3e87ad0e0843620e7ce.