Revert 436674d..ea42079

This rolls back to commit 436674da9fa8e9f6fcc1a973bcca14b788102e60.