Revert "changes for slave"

This reverts commit ddb1c5e224c517b0d659af2ec9c0511a9277ef9b.