Revert bcfdbe7..eff2917

This rolls back to commit bcfdbe79e6577288b9de5faab022a9705dd212d9.