More undone changes from 2012