Merge "Roll back recent change"