Revert dbd010d..5345d9d

This rolls back to commit dbd010d21b1e40dd6da1fb9a17fe5e0be0d33f6f.