WIP: reverting #6497