Revert "sync up any differences"

This reverts commit 9398b39d50b59630347cbf4ed21b5729eb2110c8.