Revert current.go changes