Reverting some code for debugging