Reverting unrelated changes that were accidentally checked in