Revert 27efd40..cc77f53

This rolls back to commit 27efd40cdfab7a3e2a5a7dec70f8037029ce1929.