Revert the erroneous commit r1641160. See release date in our board reports and recent dev list discussion.