Revert 82c9025..dd9bef6

This rolls back to commit 82c90256ff90708572eafa4d27b331b83faa4919.