Now back to using old commit system. fix #240