Reverted #373.