Revert 6e86c4a..0707b7a

This rolls back to commit 6e86c4af45d351d4f5d5592ea5b3528cb1993a3e.