Fix (again)

Attempt number two to put things back the way they should be