Revert 7ccc734..da4c1fe

This rolls back to commit 7ccc734b0806b8520fda5e2ae69424aae20cf11b.