Revert 82c8038..fc10c4c

This rolls back to commit 82c8038ec184e6b66ba3b9a09fca73033c109dc9.