Reverted most of the previous update.