Revert "erics commit"

This reverts commit ff4e3df4f3fb6aff0326b513414308b297715c26.