Remove spout and actually include the essential changes...