Revert 4a22eb7..8fcb6d6

This rolls back to commit 4a22eb7558bbc04240b1fe13370b48f22fa983f1.