reverting changes back to be compatible with rgalanakis' fork.