Revert e08ecbc..6748917

This rolls back to commit e08ecbcfd874b6950c53961b148148c35db11795.
Revert 8829a97..78a2863

This rolls back to commit 8829a9770ff625442cfe1ad4533471536e0ba26e.