Revert to rev. a1a4c1f