Revert bad8e03..d403405

This rolls back to commit bad8e037925202a3770de14e85d83b8ba82e184c.