Discovered bug in s:edit. Need to switch back to master without fixing...