Revert "Sidetracked again"

This reverts commit 754be8b7de5670048956f2fb596204b44b25a9a3.