Revert f1229fc..f365a30

This rolls back to commit f1229fc3803e17a4819c7d8ba47c812106756b18.