Revert "back to the future 4.7"

This reverts commit 74139c0628e96d1422c9e229799eec954e26fd41.