Revert 6416c71..933f3a9

This rolls back to commit 6416c716bab82107c683d42c5d20e8072c0aa10c.