Merge "Undo a bionic hack."