backport changes to folsom