Revert 5c88f6c..d224e69

This rolls back to commit 5c88f6cf51c4e2a429d82d7f4bab2b5e88a052f3.