Revert "synching for Nick's fixes"

This reverts commit e2fa39895811eb411ab733f065f77a291f975b8c.