Revert f009de1..fcb8d67

This rolls back to commit f009de1527123bb8023672f94008e2d63363143e.