Reverted incorrect changes in 1c2ee5c.
Reverted incorrect changes in 1c2ee5c.

Review: https://reviews.apache.org/r/52856/

kaysoky/mesos,chhsia0/mesos,reneploetz/mesos,verizonlabs/mesos,craimbert/mesos,craimbert/mesos,jpeach/mesos,reneploetz/mesos,chhsia0/mesos,verizonlabs/mesos,asamerh4/mesos,jpeach/mesos,abudnik/mesos,asamerh4/mesos,chhsia0/mesos,craimbert/mesos,Aman-Jain-14/customizedMesos,yuquanshan/customizedMesos,craimbert/mesos,Aman-Jain-14/customizedMesos,Gilbert88/mesos,dforsyth/mesos,Aman-Jain-14/customizedMesos,reneploetz/mesos,jpeach/mesos,neilconway/mesos,chhsia0/mesos,yuquanshan/customizedMesos,kaysoky/mesos,jpeach/mesos,verizonlabs/mesos,yuquanshan/customizedMesos,jpeach/mesos,andschwa/mesos,verizonlabs/mesos,jpeach/mesos,kaysoky/mesos,abudnik/mesos,zmalik/mesos,dforsyth/mesos,reneploetz/mesos,Gilbert88/mesos,andschwa/mesos,Gilbert88/mesos,abudnik/mesos,kaysoky/mesos,neilconway/mesos,gsantovena/mesos,dforsyth/mesos,andschwa/mesos,neilconway/mesos,gsantovena/mesos,reneploetz/mesos,craimbert/mesos,zmalik/mesos,chhsia0/mesos,jpeach/mesos,gsantovena/mesos,dforsyth/mesos,yuquanshan/customizedMesos,verizonlabs/mesos,andschwa/mesos,verizonlabs/mesos,gsantovena/mesos,Aman-Jain-14/customizedMesos,gsantovena/mesos,zmalik/mesos,reneploetz/mesos,neilconway/mesos,Gilbert88/mesos,neilconway/mesos,craimbert/mesos,Gilbert88/mesos,gsantovena/mesos,dforsyth/mesos,abudnik/mesos,craimbert/mesos,Aman-Jain-14/customizedMesos,reneploetz/mesos,asamerh4/mesos,andschwa/mesos,andschwa/mesos,chhsia0/mesos,kaysoky/mesos,zmalik/mesos,Aman-Jain-14/customizedMesos,kaysoky/mesos,abudnik/mesos,asamerh4/mesos,yuquanshan/customizedMesos,dforsyth/mesos,asamerh4/mesos,zmalik/mesos,verizonlabs/mesos,zmalik/mesos,zmalik/mesos,gsantovena/mesos,asamerh4/mesos,dforsyth/mesos,yuquanshan/customizedMesos,abudnik/mesos,Aman-Jain-14/customizedMesos,kaysoky/mesos,Gilbert88/mesos,neilconway/mesos,chhsia0/mesos,andschwa/mesos,abudnik/mesos,Gilbert88/mesos,asamerh4/mesos,yuquanshan/customizedMesos,neilconway/mesos