Reverting coordinator functionality from master