@emir-hasanbegovic reverting back to original commit