Revert 652a7d0..fda4115

This rolls back to commit 652a7d04e9ac2e1595bad9d2b95e5f8e3b135bcd.