Revert 29940d5..b875d3c

This rolls back to commit 29940d5e938f5f6c00ed044365d3650cdecb2b06.