Reverting more src code changes