Revert 20ce715..a336709

This rolls back to commit 20ce715ff25c75263c0ea41d2e029cce2fff51fb.