Revert "no message"

This reverts commit c40676eeaf0219b64d494c189eacf474bd77d1ed.
Revert "Resolved conflicts cherry picking from Reclaim Philly"

This reverts commit 1b74dd8eb285838f971ba0a2848dd39274052705.