Revert changes in preparation for TDD reimplementation.
Revert changes in preparation for TDD reimplementation.

jml/flocker,achanda/flocker,runcom/flocker,adamtheturtle/flocker,w4ngyi/flocker,jml/flocker,Azulinho/flocker,wallnerryan/flocker-profiles,mbrukman/flocker,runcom/flocker,agonzalezro/flocker,AndyHuu/flocker,agonzalezro/flocker,lukemarsden/flocker,1d4Nf6/flocker,LaynePeng/flocker,agonzalezro/flocker,lukemarsden/flocker,moypray/flocker,AndyHuu/flocker,1d4Nf6/flocker,w4ngyi/flocker,wallnerryan/flocker-profiles,LaynePeng/flocker,achanda/flocker,hackday-profilers/flocker,runcom/flocker,hackday-profilers/flocker,1d4Nf6/flocker,w4ngyi/flocker,mbrukman/flocker,adamtheturtle/flocker,adamtheturtle/flocker,Azulinho/flocker,jml/flocker,hackday-profilers/flocker,LaynePeng/flocker,moypray/flocker,wallnerryan/flocker-profiles,AndyHuu/flocker,mbrukman/flocker,lukemarsden/flocker,moypray/flocker,achanda/flocker,Azulinho/flocker