Merge "Reverting changes to the accessibility layer."