Restored some code that went missing! Oops.