Revert 3a2e19a..df61cfe

This rolls back to commit 3a2e19ad71dc606f8cd66d04596981f88b80620b.