Revert 070249a..82e41d9

This rolls back to commit 070249af488c4697908690b0f3c05e2c652de38a.