Re-added removed code

Trying again in “wip” branch