Reverted #2680