Reverted unrelated changes