Reverting changes which had snuck in as part of the workshop.