Revert 8215c4a..1bd2413

This rolls back to commit 8215c4a2e10507643e9b47483a52d18c2acebf84.