Reverting back to not break code after merge