Revert "updates from eric"

This reverts commit 63c8fc982acf3230e13c94e772bbc7a1b039a69b.