Reverted testing features for this particular branch