Reverting completion changes to address #114.