Reverted a couple of files back to devel.