Revert "cleanup from merge"

This reverts commit 83364e5e35ab5f2ac2123449494c4bfecb51e68f.