Revert 666abde..78f1cd8

This rolls back to commit 666abdefbdade4dd7f17504ebc8fa7248d6c28c8.