Revert to 54d389e329a860add1f609508c676761521a8ad0 due to erroneous fix.