Revert 4ed4822..15a1cdb

This rolls back to commit 4ed4822aac624b76743e710bb07bc6920be28002.