Revert adc82eb..13a441b

This rolls back to commit adc82eb88c16c2881732eff2febfcc3bd8b13c05.