#5487 from FernetMenta/fastswitch": reinstate

This is going to get messy...