Reverted #3305